gdk: Move modifier mask api to GdkDisplay

GdkKeymap is on the way out.

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index e402a929d1112b2dc42535cc05e0f5792809ce60..ce3963a542106275b73c08d235e87a2ada19b70e 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1711,3 +1711,10 @@ gdk_display_set_cursor_theme (GdkDisplay *display,
   if (GDK_DISPLAY_GET_CLASS (display)->set_cursor_theme)
     GDK_DISPLAY_GET_CLASS (display)->set_cursor_theme (display, name, size);
 }
+
+GdkModifierType
+gdk_display_get_modifier_mask (GdkDisplay        *display,
+                               GdkModifierIntent  intent)
+{
+  return gdk_keymap_get_modifier_mask (gdk_display_get_keymap (display), intent);  
+}

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index bdd6c985cb2bb85b04589a956031f0db6333384a..8d9aace4025141b40faa4cd2043ae560615b13bc 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -118,6 +118,10 @@ GdkMonitor * gdk_display_get_monitor_at_surface (GdkDisplay *display,
 GDK_AVAILABLE_IN_ALL
 GdkKeymap *  gdk_display_get_keymap  (GdkDisplay *display);
 
+GDK_AVAILABLE_IN_ALL
+GdkModifierType gdk_display_get_modifier_mask (GdkDisplay        *display,
+                                               GdkModifierIntent  intent);
+
 GDK_AVAILABLE_IN_ALL
 gboolean     gdk_display_get_setting (GdkDisplay *display,
                                       const char *name,